From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 3 Jul 2015 18:11:41 +0000 (-0700)
Subject: Made recent changes purge jobs bail more aggressively
X-Git-Tag: 1.31.0-rc.0~10809^2
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=f43a74aa593f82b45aa112dd662c8d06f4181ea0;p=lhc%2Fweb%2Fwiklou.git

Made recent changes purge jobs bail more aggressively

* This should handle unusual spikes better

Bug: T104670
Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
---

diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index e86d9147e2..d6fa26b81f 100644
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -75,11 +75,13 @@ class RecentChangesUpdateJob extends Job {
 		$lockKey = wfWikiID() . ':recentchanges-prune';
 
 		$dbw = wfGetDB( DB_MASTER );
-		if ( !$dbw->lock( $lockKey, __METHOD__, 1 ) ) {
+		if ( !$dbw->lockIsFree( $lockKey, __METHOD__ )
+			|| !$dbw->lock( $lockKey, __METHOD__, 1 )
+		) {
 			return; // already in progress
 		}
-		$batchSize = 100; // Avoid slave lag
 
+		$batchSize = 100; // avoid slave lag
 		$cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
 		do {
 			$rcIds = $dbw->selectFieldValues( 'recentchanges',